Added initial scroll support