JCR Api Cleaned up